fixed warnings for real this time