Patch provided in #26 is working as expected. Please find attachment (Availab...