Fixed the extend reference issue : STORM-80