Fixed stupid properties thing