Got a simple workaround for the issue...