Fixed bug with fallback function