Fixed issues #: 28, 27, 26, 24, 23, 18