Attemp to fix #295

#295