Temporary fix for testing