Should fix #4