Added a temporary fix for demo purposes