Bugfix and extract method