Fixed an error introduced in the modularisation