Fixed issu #23