Design fix #1