Bugfix to add customisation