Fixed movie handler.
Merged changes.