Maker Final Bug Fix