Fixed bug with loading prop