Addressed in c5b8685