Fix broken factory expression
Avoid unecessary function call