This might fix it? see ticket:1

Fixes ticket:1