Reverted model to use MSL functions as the bug is fixed in MSL 3.2.1