Bugfix/loader style