Soft17 bugfix done