added some safe-fallback