Trying to fix #309