bug fixing (Stage 1, unstable )