Fix #274

Fix #274 and replace #310 
This import is not needed.