Issue#90

also this line may not be needed anymore