Forgot to finish fixing properties