rawly fixed issue #4