#536 fixing implementation