Elasticbean fix