FIX: avoid this problem reoccuring in future