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