Try to fix #11