Fixing mess, #190

#190