Changed bitmap handling