This concerns me, could be a breaking change.