Ninja fix #2