Bug fix (Andrea, Adam)