Changed base to fix #24