Fix property
Idea for #378

Will flesh out later