Fix #21
Function called once