added fallback behaviour mentioned in #24