Fixed code for v1.0.3