Definitely fix #24