This *should* fix #9 for now