Fixed Issues #123 & #125