Might fix #4