#219, #240; fix attr/prop usage