really fixed issue 59