Implemented feedback from Jonas Skeppstedt.