Fix after mjulian suggestion