fixed fallback behaviour and clarified it in javadocs