#7 possible fix. Needs to be tested, search '#7 Fix'