Fix for status update and currentOrder retrieve