Fixed Propety Issues