Fixes tamasgal/royweb/issues/#6