Closes issue #1190 and some attribute bugs that were similar