#834 Quickfix to manage intersecting shapes