Temporary rubberband crash fix, closes #28