Fixes #4, please be this the final fix!@!