fixing Serializable issue