Fixes #105, properly this time