Fixing some little Bug