Fixes #117 including attributes