fixed bug in #15