Properly fix #11