Should help fix #3