Try to fix minor bug again