v2.94: Implementing a Fix

Fixes #13 as this was bothering a small amount of users, ~1%. I am not sure if this will completely fix it or even why it is happening but seems like my best shot. Hope that it will work out okay.