Fixed Issue #48

Give this a try on beta if you would to see if I managed to get this fixed.