Fixing S&R errors propably caused by changes in ISSUE #101
Fixing more s&r errors propably caused by changes in ISSUE #101