Fixed Issues #123 & #!25