Fixing start-up for current swank