Fixed issue #3 (hopefully for good this time)