Fix import shadows

Fix #1