Fixed proper and tested