This might fix it?

Lets try this again, fixes ticket:1