Fixed #177 Note: ask Lizbeth why that code was there