Crude fix for #3. Commented out.
Needs a better fix