Fixes #4 AGAIN