Follow up from: https://github.com/devilbox/web-ui/issues/35
Follow up from: #35