Merged before seeing comments :( will fix on develop