closes Zeega-Issues/Issues#284