Fixed prop handling