Should fix #6