Fixed bug with framework