Took care of #56