closes #145 - closing with a temporary fix