#402 Fixed minor issue with incorrect return value on callback