Fixed issue #1, for real