Fix #15 & #17