Mahendra | #541 | retaining week value if present