Trying to fix #28