URGENT: Bug fix essential for use