Removed the hack. Fixes #14.