Bug fix on amarino service