fixed issu #45