Fixed shotting issue