Fixed bug #2 for now