closes Zeega/Zeega-Issues#666