Should fix #3