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