More fixing

#45