#153 garbage removed
#153 works on test DB