closes Zeega/Zeega-Issues#475