Issues id=14, id=15,id=16

issues are a result of changes by krglok :(