Try to fix #238
for me it works, but not sure if this is working for all