Fix #51 & Possibly #31