Hopefully Hotfixed Issue #50