Workaround boundary issues