Probrably fix #1367