closes Zeega/Zeega-Issues#361