Version 1.0.2 bug fix