Ninja fix #4?