Fixing some minor bug