Should probably remove the property and enforce the call to reduce possible bugs from popping up...