Fix for double behaviour creation