Workaround for edge case