Update to master
Temporary solution to save problem caused by associations.