Quick Fix for #65. Needs to be fixed properly