Update after fix #11