Fixed #205 -- updated with fresher AMIs.