hopefully fix #486