Not sure what changed, but commiting it as it still works