Resoluation bug solve