Fix 243

This should fix #243 with clearances and additions