Fixed e115 & e116

closed issue #1