[MP] Partial fix for rotate pic.

Refs #584
[SP] Partial fix for rotate pic.

Refs #584