fix pr 18