fixing #76
fixing #76