Took care of #95