Fixed #297 by redoing the changes from #273