This should finally fix #56