Fixed #1 - yeaaaah!