Crappy fix for issue #3