Does not fix #2