Partial fix to drop issue, new render bug introduced.