PR to fix #13 (ugly)