Attemp to fix #295