#14 Fixed connection area positions