Trying to fix #24.