fallback implemented and warning removed
merged