#302 fixing