HotFixes #24 #25 y #27