Issue-15 : Fix #15