bug fixing 0.0.7