Potentiall fix #179, more investigation needed