This should fix the issues of 1.0.2