fix order dependency issue with computed properties

fixes #1294 and #1295