Trying to resolve issu #46